Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Less Overpowered Commando ERTs (Marsoc, WY Whiteout, UPP Commandos) #4466

Merged
merged 9 commits into from
Nov 13, 2023

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Sep 21, 2023

About the pull request

This PR adds three new alternative Commando distress calls for admin/staff only usage. These are variants of the Marsoc, WY Whiteout and UPP Commando that use less overpowered gear.

The non-OP versions have no unique identifier in the admin menus, however the overpowered versions are denoted with the affix of "(!DEATHSQUAD!)". This applies to both the distress call and the preset.

Marsoc: Have lost HEAP/Special Explosives/Unique Medical Items
WY Whiteout: Have lost HEAP/Special OP Flamer/Extra OP Smartgun, they are still combat Synthetics
UPP: Have lost their cloaking abilities, they still retain a cloak for the aesthetic but it is non-functional.

Explain why it's good for the game

Commando ERTs are virtually never used in game outside of zombies or for clean-up after an event due to how oppressively overpowered they are.

This addition will allow admins/staff to make usage of these unique ERTs more commonly for events without having to worry about them annihilating the entire server. While each ERT is still quite powerful, they are not as destructive.

I am 100% open to further changes as needed.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Less powerful variants of the Commando ERTs (Marsoc, WY Whiteout, UPP Commandos) have been added for admin use.
admin: The powerful versions of commando ERTs are denoted with (!DEATHSQUAD!) in the distress call and equipment preset menus.
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Admin Make things harder for admins labels Sep 21, 2023
@BeagleGaming1
Copy link
Contributor

The regular, overpowered, ERTs are denoted with the affix of "(!WHITEOUT!)".

This seems like it'll be confusing, "Whiteout" is the WY thing, it wouldn't make sense for Marsoc / UPP to have this affix, why not just say it's a "Deathsquad"?

@Steelpoint
Copy link
Contributor Author

The regular, overpowered, ERTs are denoted with the affix of "(!WHITEOUT!)".

This seems like it'll be confusing, "Whiteout" is the WY thing, it wouldn't make sense for Marsoc / UPP to have this affix, why not just say it's a "Deathsquad"?

That does sound better than what I thought, done.

code/datums/emergency_calls/deathsquad.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/deathsquad.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/deathsquad.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/deathsquad.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/deathsquad.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/whiteout.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/whiteout.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/whiteout.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/whiteout.dm Outdated Show resolved Hide resolved
code/modules/gear_presets/whiteout.dm Outdated Show resolved Hide resolved
@Steelpoint
Copy link
Contributor Author

Tidied up the code.

References to the overpowered versions of the commandos are now all properly denoted with !DEATHSQUD! whereas the less powerful versions have no unique identifier. This applies to both the distress call and the preset equipment.

code/datums/emergency_calls/upp_commando.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/upp_commando.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/upp_commando.dm Outdated Show resolved Hide resolved
@morrowwolf morrowwolf marked this pull request as draft September 30, 2023 06:02
@Steelpoint Steelpoint marked this pull request as ready for review September 30, 2023 08:50
@Steelpoint
Copy link
Contributor Author

I believe all requested changes have been made.

@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Oct 19, 2023
@github-actions github-actions bot closed this Oct 27, 2023
@Huffie56 Huffie56 reopened this Oct 27, 2023
@github-actions github-actions bot closed this Nov 4, 2023
@harryob harryob reopened this Nov 7, 2023
@harryob harryob removed the Stale beg a maintainer to review your PR label Nov 13, 2023
@harryob harryob added this pull request to the merge queue Nov 13, 2023
Merged via the queue into cmss13-devs:master with commit 895c071 Nov 13, 2023
74 checks passed
cm13-github added a commit that referenced this pull request Nov 13, 2023
@Steelpoint Steelpoint deleted the commandoalt branch November 13, 2023 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Make things harder for admins Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants